Merge remote-tracking branch 'savannah/master' into HEAD

author Andrea Corallo <akrl@sdf.org>

Sun, 13 Sep 2020 16:20:21 +0000 (18:20 +0200)

committer Andrea Corallo <akrl@sdf.org>

Sun, 13 Sep 2020 16:20:21 +0000 (18:20 +0200)
author Andrea Corallo <akrl@sdf.org>
Sun, 13 Sep 2020 16:20:21 +0000 (18:20 +0200)
committer Andrea Corallo <akrl@sdf.org>
Sun, 13 Sep 2020 16:20:21 +0000 (18:20 +0200)
diff --cc .gitignore
Simple merge
diff --cc configure.ac
Simple merge
diff --cc lisp/files.el
Simple merge
diff --cc lisp/gnus/gnus.el
Simple merge
diff --cc lisp/help-fns.el
Simple merge
diff --cc lisp/loadup.el
Simple merge
author	Andrea Corallo <akrl@sdf.org>
	Sun, 13 Sep 2020 16:20:21 +0000 (18:20 +0200)
committer	Andrea Corallo <akrl@sdf.org>
	Sun, 13 Sep 2020 16:20:21 +0000 (18:20 +0200)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/files.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/gnus/gnus.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/help-fns.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/loadup.el	patch \|	diff1 \|	diff2 \|	blob \| history